From: Keir Fraser Date: Wed, 3 Jun 2009 10:20:38 +0000 (+0100) Subject: typo: occured -> occurred X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~13821 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=3a54261aba28ce2afdad772c9d56b4111ff17852;p=xen.git typo: occured -> occurred Signed-off-by: Masaki Kanno --- diff --git a/docs/misc/xsm-flask.txt b/docs/misc/xsm-flask.txt index e27f651552..b6f0431a24 100644 --- a/docs/misc/xsm-flask.txt +++ b/docs/misc/xsm-flask.txt @@ -1,4 +1,4 @@ -These notes are compiled from xen-devel questions and postings that have occured +These notes are compiled from xen-devel questions and postings that have occurred since the inclusion of XSM. These notes are not intended to be definitive documentation but should address many common problems that arrise when experimenting with XSM:FLASK. diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 2ef204315e..113d49ad31 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -354,7 +354,7 @@ void mcheck_cmn_handler(struct cpu_user_regs *regs, long error_code, vcpu_schedule_unlock_irq(v); irqlocked = 0; - printk("Terminal machine check exception occured in " + printk("Terminal machine check exception occurred in " "hypervisor context.\n"); /* If MCG_STATUS_EIPV indicates, the IP on the stack is related @@ -666,7 +666,7 @@ void x86_mcinfo_dump(struct mc_info *mi) mc_global->mc_coreid, mc_global->mc_gstatus); } else { printk(XENLOG_WARNING "MCE: The hardware reports a non " - "fatal, correctable incident occured on " + "fatal, correctable incident occurred on " "CPU %d.\n", mc_global->mc_coreid); } diff --git a/xen/arch/x86/x86_32/supervisor_mode_kernel.S b/xen/arch/x86/x86_32/supervisor_mode_kernel.S index 39a74ac653..a4fae6c3f3 100644 --- a/xen/arch/x86/x86_32/supervisor_mode_kernel.S +++ b/xen/arch/x86/x86_32/supervisor_mode_kernel.S @@ -98,7 +98,7 @@ ENTRY(fixup_ring0_guest_stack) addl $((6+4)*4),%esi # %gs:%esi now points to the guest stack before the - # interrupt/exception occured. + # interrupt/exception occurred. movl $PER_CPU_GDT_ENTRY*8,%ecx lsll %ecx,%ecx diff --git a/xen/include/asm-ia64/linux-xen/asm/perfmon_default_smpl.h b/xen/include/asm-ia64/linux-xen/asm/perfmon_default_smpl.h index 48822c0811..0d2c54fc50 100644 --- a/xen/include/asm-ia64/linux-xen/asm/perfmon_default_smpl.h +++ b/xen/include/asm-ia64/linux-xen/asm/perfmon_default_smpl.h @@ -67,7 +67,7 @@ typedef struct { unsigned long ip; /* where did the overflow interrupt happened */ unsigned long tstamp; /* ar.itc when entering perfmon intr. handler */ - unsigned short cpu; /* cpu on which the overfow occured */ + unsigned short cpu; /* cpu on which the overfow occurred */ unsigned short set; /* event set active when overflow ocurred */ int tgid; /* thread group id (for NPTL, this is getpid()) */ } pfm_default_smpl_entry_t; diff --git a/xen/include/asm-ia64/linux-xen/linux/efi.h b/xen/include/asm-ia64/linux-xen/linux/efi.h index 4d53746fbc..2229101a26 100644 --- a/xen/include/asm-ia64/linux-xen/linux/efi.h +++ b/xen/include/asm-ia64/linux-xen/linux/efi.h @@ -469,7 +469,7 @@ struct efi_generic_dev_path { /* rr7 (and rr6) may already be set to XEN_EFI_RR7 (and XEN_EFI_RR6), which * would indicate a nested EFI, SAL or PAL call, such - * as from an MCA. This may have occured during a call + * as from an MCA. This may have occurred during a call * to set_one_rr_efi(). To be safe, repin everything anyway. */